BJS2-77992. Добавлено создание цели #2969
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FROLOV-KI
commented
May 8, 2025
FROLOV-KI
commented
- Добавлен GoalService
- Добавлен GoalController
- Добавлен GoalMapper
- Добавлены кастомные исключения для сущностей goal и skill 5) Добавлен SkillService
- Добавлен GoalExceptionHandler
1) Добавлен GoalService 2) Добавлен GoalController 3) Добавлен GoalMapper 4) Добавлены кастомные исключения для сущностей goal и skill 5) Добавлен SkillService 6) Добавлен GoalExceptionHandler
1) Вызов маппера перенесен в контроллер 2) Добавлены классы валидаторы
psvm-dev
requested changes
May 9, 2025
src/main/java/school/faang/user_service/entity/goal/mapper/GoalMapper.java
Show resolved
Hide resolved
src/main/java/school/faang/user_service/exception/goal/MaxActiveGoalPerUserException.java
Show resolved
Hide resolved
src/main/java/school/faang/user_service/repository/goal/GoalRepository.java
Outdated
Show resolved
Hide resolved
psvm-dev
approved these changes
May 9, 2025
1) Удален GoalExceptionHandler.java 2) Добавлен метод удаление связи цель - скилл
tanufa25
reviewed
May 9, 2025
src/main/java/school/faang/user_service/validator/goal/SkillValidator.java
Show resolved
Hide resolved
tanufa25
reviewed
May 10, 2025
| private final CreateGoalMapperImpl createGoalMapper; | ||
| private final UpdateGoalMapperImpl updateGoalMapper; | ||
|
|
||
| @PostMapping("/create") |
There was a problem hiding this comment.
PostMapping самодостаточный для create, его лучше без параметров оставить, и по этой url /api/v1/goal делать create
tanufa25
reviewed
May 10, 2025
| .body(createGoalMapper.goalToDto(createdGoal)); | ||
| } | ||
|
|
||
| @PutMapping("/update/{goalId}") |
tanufa25
reviewed
May 10, 2025
| return ResponseEntity.ok(updateGoalMapper.goalToDto(createdGoal)); | ||
| } | ||
|
|
||
| @DeleteMapping("/delete/{goalId}") |
20cognosce
requested changes
May 10, 2025
src/main/java/school/faang/user_service/controller/goal/GoalController.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/controller/goal/GoalController.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/controller/goal/GoalController.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/controller/goal/GoalController.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/entity/goal/dto/GoalDto.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/service/GoalService.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/validator/goal/GoalValidator.java
Outdated
Show resolved
Hide resolved
src/main/java/school/faang/user_service/validator/goal/GoalValidator.java
Show resolved
Hide resolved
src/main/java/school/faang/user_service/validator/goal/GoalValidator.java
Show resolved
Hide resolved
1) Разделил DTO для создания, обновления и ответа 2) Добавил User сервис 3) Добавил в DTO поле deadline
20cognosce
approved these changes
May 22, 2025
20cognosce
left a comment
20cognosce
left a comment
There was a problem hiding this comment.
Нормально, но чересчур многовато получилось для этой задачи, 700 строк
|
|
||
| @JsonInclude(JsonInclude.Include.NON_NULL) | ||
| public record UpdateGoalDto( | ||
| @NotBlank(message = "Empty goal title not allowed!") String title, |
There was a problem hiding this comment.
можно не писать подробные сообщения
Comment on lines
+47
to
+49
| @Query(nativeQuery = true, value = """ | ||
| DELETE FROM goal_skill | ||
| WHERE goal_id = :goalId""") |
There was a problem hiding this comment.
лучше не нативкой это делать, а через JPA
Comment on lines
+52
to
+55
| @Query(nativeQuery = true, value = """ | ||
| DELETE FROM user_goal ug | ||
| WHERE ug.user_id = :userId AND ug.goal_id = :goalId | ||
| """) |
Comment on lines
+26
to
+28
| String notExistingSkillsId = absentSkillsId.stream() | ||
| .map(String::valueOf) | ||
| .collect(Collectors.joining(", ")); |
There was a problem hiding this comment.
вот это целое действие только ради лога, такое
| goalRepository.removeGoalFromUser(userContext.getUserId(), goalId); | ||
|
|
||
| if (goalRepository.findUsersByGoalId(goalId).isEmpty()) { | ||
| goalRepository.findByParent(goalId).forEach(goalRepository::delete); |
There was a problem hiding this comment.
что со вложенностью-то решили? может сделаешь тогда ограничение, что если у цели есть родитель, то она сама не может быть родителем? чтобы был 1 уровень вложенности
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.